GitHub Issue #30, #37, #38