v0.5.0
Merge remote-tracking branch 'c2fo/master'

Conflicts:
	README.md
Merge pull request #59 from doug-martin/master

v0.5.0