Addressed issue #21