Merge pull request #1 from otland/master

Merge pull request #1092 from jfevia/master