Merge pull request #1 from nimnull/master

A bit of refactoring on importing in flask way