[Github Issue #24]