Merge pull request #11 from baasbox/master

update from origin repo
fixed #107

Migrated settings from dictionary indices to a class
Merge pull request #108 from giastfader/master

fixed #107