Merge pull request #6 from pchampin/develop

Bugfix and improvement