Merge pull request #1335 from phkelley/development

Improve MSVC compiler, linker flags