Merge branch 'develop'

Add iOS Simulator support
Merge branch 'develop'
Merge branch 'develop'

Use Travis-CI.org for testing new commits