Here is my suggestion: #184