Merge pull request #49 from jmlvanre/master

Resolve Issue #11