Add v0.1.2 features and bugfixes