changes
Merge pull request #28 from pstephen43/master

changes