Merge pull request #1 from fromeroj/master

v3