small fixes
Merge pull request #60 from sbillard/master

small fixes