Merge development into development for version 0.1.1