Merge pull request #3 from flavio/master