Minor bug fix
merge conflict
Fixed encodings
Merge pull request #91 from JoshuaEstes/UpdatedSomeCodeDocBlocks

Updated some code doc blocks