Merging unstable into master

Good to go for v0.2