Pull Request merge

Merges the @omarreiss 's 2 pull requests: 
https://github.com/anynines/cf_swift_service/pull/7
https://github.com/anynines/cf_swift_service/pull/3

I tested them on the staging system and everything worked fine.