iOS-124,iOS-126,iOS-127
Merge pull request #2 from Splean13/test

iOS-124,iOS-126,iOS-127