Fixes #3

I have no idea about any of this. Don't merge unless you agree with every change, because I really have no idea what I am doing.

:wink: