Fixing Issue #1 on Github