Changes to work on iOS. Version 1.01