First Version
added platform type
Merge pull request #9883 from billp/master

First Version