Merge pull request #54 from inspiran/master

Refactoring
Added store settings class to have unlimited store settings