Fixed Issue #12 and Issue #14