Merge pull request #215 from camilin87/master

merge last changes to my branch