fix issue #78
Merge branch 'issue_78' into dev