next release on master will be 0.5.0
Merge remote-tracking branch 'punkave/master'