[Github Issue #39]