Issue 32: Initial code from Kamal
Merge the from remotes/origin/kamal