fix issue #83
Merge branch 'dev'