updates
Merge pull request #18 from ktsweb1/devEric

Eric minor bug fixes
Merge pull request #20 from ktsWeb/master

dev update from master