Merge pull request #23 from bng8/master

gerry push
QoL
Merge pull request #13 from Johnidel/master

Jerry