Resolve Issue #5, Issue #14, Issue #17