changes
Merge pull request #25 from jasondreyzehner/master

changes