worked on documentation and a bit of code
Merge pull request #114 from HoltMaki/master

worked on documentation and a bit of code