Merge pull request #161 from da2ce7/develop

fix compile bug from travis-ci and nsi installer fix.
fix for C++03 builds