Merge pull request #27 from bng8/master

b
guard changes
small fixes
Merge pull request #16 from Johnidel/master

gerry and jerry want more code