Fixes for VS2013 from Tim
Fixes for VS2013 from Tim
Merge pull request #274 from nicksavers/develop-poc-5

VS2013 fixes for develop-poc-5 branch