optimizing
Merging
Merge pull request #27 from pstephen43/master

sync up