Merge pull request #1 from valtam/master

Merge changes
Merge pull request #5 from shaggytwodope/master

Merge pull request #1 from valtam/master