Merge pull request #34 from denibertovic/master

*major* refactoring and *cleanup*
Merge branch 'master' of github.com:KSET/kset-org