fix issue #30
fix issue #34
Version 0.6.6
Merge branch 'dev'