Update platform support
Merge pull request #598 from cgohlke/patch-1

Update platform support