Kmoya dev branch merged to master branch

some overall changes, does no affect anybody