Merge development into master. Updating to v0.1.1