Manually adding PR #58 from @theanxy