Merge pull request #38 from bowsersenior/master.