Incorporate feedback on merge request 7
This is an attempt to incorporate Senya's merge request by rebasing and adding changes requested in the feedback.
For this I manually cherry-picked his commit into the renamed file and added a miniscule addition on top hopefully satisfying the feedback.