minor fixes
Merge pull request #30 from guywithnose/master

minor fixes