Refined imports
Merge branch 'master' of git@github.com:bahboom/mamoi.git
Some updates