fix #67
Merge branch 'master' into MaksJS-issue_67