IOS-145, IOS-148
Merge pull request #5 from Splean13/test

IOS-145, IOS-148