Merge pull request #13 from Johnidel/master

Jerry
Jerry again
Merge pull request #24 from bng8/master

Merge pull request #13 from Johnidel/master