added osx implementation
Merge branch 'master' of github.com:caseydunham/xps