Merge pull request #24 from bng8/master

Merge pull request #13 from Johnidel/master
changesz
Merge pull request #14 from Johnidel/master

Jerry wants code