Merge pull request #32 from BenoitDuffez/master

Fix crashes and code compilation