I added a new commit reflecting to your complaint. Please take a look if you find it possible to merge. Thanks!