fixed bug from normal command line use
fixed bug from watchdog use
Merge pull request #310 from jrcartee/master

Small bug fixes