Merge pull request #873 from ngodfraind/master

bugfixes