various bug fixes
Merge pull request #80 from clovis/master

Push fixes upstream