doc
Merge pull request #148 from HoltMaki/master

doc