Documentation
Merge pull request #409 from haines/docs

Documentation