Addressed issue #26 and issue #15 and issue #21