proofread + changes until line 68
Merge pull request #1 from ffffux/master

proofread + changes until line 68