Organized imports
Merge branch 'master' of https://github.com/spoertsch/twipser
Refactorings