Added another platform to test.
Merged John's platform additions.