some changes

ready for the demo
Merge pull request #150 from camilin87/kmoya-dev-branch

Kmoya dev branch merged to master branch