Fixed the VS2012 issue.
Merge pull request #41 from dmohl/master

Fixed the VS2012 issue.