Fixes for Issue #1 on the GitHub project

These changes fix Issue 1 items