fixed some imports
Merge branch 'master' of github.com:sirrice/scorpion