Merge pull request #69 from ned14/master

VS14 CTP 3 support