formatting fixes, bug fixes
Merge branch 'master' of github.com:bertramdev/imports