addressed issue #16 and #21