Merge pull request #14 from stef145g/master

Update build files for MSVC 2013e
Merge remote-tracking branch 'remotes/origin/master' into mmex_helper