fixed #5
Merge branch 'dev' into version
0.1.47