fix to link library problem (Thanks Nohal)
added wxwidgets library
Merge branch 'master' into version_1.3