Merge pull request #1 from valtam/master

Merge changes