fix issue #77
Merge branch 'dev'