Added changes
Merge branch 'master' of https://github.com/mrbarde/k1

changes