updates to v0.1.2
merging 0.1.2 changes