Merge pull request #86 from andrew-elder/master

MSVC updates
updates to linux gcc build errors