Fixed Issue #12 and #11