Multiple corrections
Merge pull request #40 from nitrocaster/master

Multiple corrections