fixing 2 minor issues for issue #60
Merge pull request #75 from worldspawn/fix/60

2 minor fixes