Merging unstable into master for 0.3

Good to go for 0.3