IOS-144, IOS-142, IOS-143, IOS-133, IOS-146, IOS-136, IOS-138
Merge pull request #3 from Splean13/test

IOS-144, IOS-142, IOS-143, IOS-133, IOS-146, IOS-136, IOS-138