Merge pull request #9 from ndavis10/master

load from upstream
update visual studio
Merge pull request #33 from mdeboer1/master

update from upstream