Issue #83
issue #83 /cleaner implementation/
Merge pull request #84 from rado-h/upstream-master

Closes #83