Issue # 11 and #12