Preparation for v0.5.0 release
Bumping version for development
Merge pull request #1 from alanxz/master

Update from upstream