Merge pull request #24 from camilin87/kmoya-dev-branch

Kmoya dev branch
Profile created using LinkedIn
Merge pull request #25 from camilin87/master

Merge last changes to my branch