Fixes Issue #335
Merge pull request #370 from brunocascio/dev

Fixes Issue #335