Merge pull request #25 from pstephen43/master

sync up