Fixed #6
Fixed #7 (untested, but should work) and commented some lines of code to help other devs understanding something
Merge pull request #8 from JN-Jones/development

Merge pull request #8 from JN-Jones/development