another commit
Merge pull request #27 from mandersonrmark/master

another commit