Merge pull request #25 from kdopen/doc_cleanup

Clean up documentation and correct sample code