Merge pull request #48 from dejan-brkic/master

Configuration controller