Develop

Merging develop into master, I think it's stable enough now to do so