This commit addresses Issue #11