Fix compiler warning C4800 in Microsoft VC 2013 Express
Revert "Fix compiler warning C4800 in Microsoft VC 2013 Express"

This reverts commit b976d14956eef1e45e7c37dee65f399c471cf96f.
Revert "Revert "Fix compiler warning C4800 in Microsoft VC 2013 Express""

This reverts commit 64dae16b2e2bcf75a73b9eca12c0f57d1a10f82d.
Merge pull request #3 from stef145g/master

Fix compiler warning C4800 in Microsoft VC 2013e