Merge pull request #8 from iantocristian/master

manual merge pull request #6