Fix two issues
Merge pull request #90 from sbillard/master

Fix two issues