Upgrade to VS 2013
Merge pull request #41 from OJ/vs2013

Upgrade to VS 2013