Merge pull request #1 from blorente/master

Pulling again