Fixed compilation issue on Windows
Merge remote-tracking branch 'upstream/master'
Merge pull request #196 from fabienrohrer/master

Fixed minor compilation issue
Improved code
Merge pull request #197 from fabienrohrer/master

Minor code improvement