Lots of work
Merge pull request #120 from HoltMaki/master

Lots of work