* Some changes to make the project completely compatible to MSVC11 (VS2012)
Merge pull request #36 from ChrislS/master

* Some changes to make the project completely compatible to MSVC11 (VS2012)