Merge pull request #92 from akkie/master

Revert #87
Reorganize imports
Check if auth info will be stored