Rearranging and fixing type stuff (I hope)
Setting version to 0.1.2
Setting version to 0.1.3-SNAPSHOT