Merge pull request #12 from mcamou/master

Fixes for issue #10