Merge pull request #44 from gabriele-v/master

Workaround for Windows version don't need anymore with wxWidgets 3.0.1
update
Merge pull request #45 from vomikan/master

update