minor fixes
Merge pull request #18 from joekteo/fixes

minor fixes