Fixed some bugs to v0.2
Merge branch 'hotfixes'