Merge pull request #1 from plasticle/master

Allows build in Visual Studio 2012
Merge remote-tracking branch 'upstream/master'