Fixing Makefile
Fixing VS MP projects
Merge pull request #290 from Yberion/master

Fixing VS MP projects + Makefile