Issue 11

Adressed issue 11, with the feedback I got at the time, and to my current understanding :)