Grouping imports, fixes a XCode 6 compilation error
Merge pull request #2 from shouze/fix/imports

Grouping imports, fixes a XCode 6 compilation error