Merging develop -> master

(hopefully) final merge in to master before the v0.1 tag