Issue #164 - addresses commit @917fb30