Merge pull request #328 from damianorenfer/master