vs2012
Merge pull request #3 from ryanjmulder/master

vs2012