Merge pull request #215 from camilin87/master

merge last changes to my branch
Merge pull request #218 from camilin87/kmoya-dev-branch

Merge pull request #215 from camilin87/master