Merge pull request #25 from m0wfo/master

Fix typo, strip trailing whitespace
Fixed typo
Merge pull request #26 from StephenHynes7/patch-2

Fixed typo
Use printf instead of echo as \n is being printed currently
Merge pull request #1 from m0wfo/master

misc text typos + whitespace stripping
fix merge conflicts w/ upstream