Merge pull request #170 from psimeroth/Win8.1Update

Looks good, thanks for working quick to get those fixes in for us, Perry!
Merge branch 'master' into Win81Update