I recently opened issue #115, if you agree with it, please help make changes by following the order defined in that issue.