Updated documentation
Merge pull request #26 from shawnhermans/doc-updates

Updated documentation