Merge pull request #1 from cubedro/master

Fixed autoprovider bug
common changes
Merge pull request #12 from debris/master

Update from debris:master