Implement #50