Merge pull request #3 from jrmash/master
Karen Etheridge [Wed, 20 Aug 2014 04:11:34 +0000 (21:11 -0700)]
MSVC Compiler Compatibility


Trivial merge