Merge pull request #128 from akire/windows-universal-build

Windows universal build