My test commit. (issue #38) #hours 11.
Merge pull request #39 from dansterrett/master

Some stuff