Merge pull request #40 from micahalcorn/repair_typographical_errors_and_inconsistencies

Repair typographical errors and inconsistencies
Merge remote-tracking branch 'upstream/master'