Clean Up
Clean Up to version 0.1.2-alpha
Merge branch '0.1.1'