Apply Jason Foreman sdcontainer fix and take out more stuff from that method that wasn't necessary.
Merge branch 'master' of github.com:setdirection/ios-shared