changes
Merge pull request #30 from pstephen43/master

changes