Refactors
Merge branch 'master' of github.com:pablosmedina/ckite