Issue #12 - 1) and 2) fixed