Closing issue #10 and #12 and addresses issue #16.