small bugs fixed
Merge branch 'version_0.1_fix_I' into version_0.1