Merge pull request #1 from erikporter/master

Adding support for Windows Universal.