Fixes #38, Fixes #36