Moved methods around, added more helper methods
Merge branch 'master' of https://github.com/evilpenguin/Swift