Fix critical bug & update to 0.1.2
Merge pull request #4341 from ethan605/fork

Fix critical bug & update to 0.1.2