Merge pull request #1 from catoldcui/master

v0.5