refactor and completed functionality
Merge branch 'master' of github.com:Nardoz/kiwi
fixed slot id