Issue #83
issue #83 /cleaner implementation/
Merge remote branch 'origin/upstream-master'