Merge pull request #42 from erikporter/master

Adding support for Windows Universal.