Adding commit from issue #11