attempt to fix issue#3
Merge branch 'V0.3.1' into dev