Fixed Issue #2 and #1