Merge pull request #3 from fincatto/master

Merge