This is the version that was pushed to the appstore. Will merge to master