Kmoya dev branch merged to master branch

ready for the demo