Improved import users and bugs correction
Merge pull request #50 from nmpetkov/patch-5

Improved import users and bugs correction