merge bug-fixes in release 0.1.0 to master

merge bug-fixes in release 0.1.0 to master