minor fixes
Merge pull request #341 from gogolander/test

minor fixes