Merge pull request #1586 from reaperhulk/more-supported-platforms

update supported platforms