Reordered methods
Merge pull request #8 from msg-ios/master

Reordered methods