Fix #482 and add tests
Fix #482
Fix #482. Add iPhone platform and test.
Fix #482. Fix comma in test file.
Merge pull request #483 from aumel/issue-482

Fixes #482