bugfixes
Merge pull request #4 from ngodfraind/master

bugfixes