documentation mostly
Merge pull request #115 from HoltMaki/master

documentation mostly