small bugfixes
Merge pull request #18 from frankrousseau/master

small bugfixes