Preparing for v0.5.0
Merge remote-tracking branch 'upstream/master'