Merge pull request #272 from EricWittmann/master

Reverted to MS 3.2 due to a failing unit test