Addressed issue #11