Merge pull request #13 from Johnidel/master

Jerry