Woolie Improvements
Merge branch 'master' of github.com:setdirection/ios-shared
Merge pull request #70 from walmartlabs-wmusiphone/master

Replaced tab with spaces, check for NSNotFound