Patch1

Regarding issue #71 .
Since this was from master branch, and it isn't even with develop, some of your commits come through...