Windows phone commit
Merge pull request #128 from JonDouglas/master

Windows phone commit