Merge pull request #12 from vikinghug/tweaks/just-stuff

Tweaks/just stuff
Merge pull request #13 from vikinghug/development

Tweaks/juststuff