Fixing Issue #12 and other more minor changes