Implement #54, thanks