Fixes for Issue #1 on the GitHub project