Fixed 10, 22; Added 47-64.
Fixed a typo.
Merge pull request #1 from Comphuse/master

Fixed 10, 22; added 47-64
update
Merge remote-tracking branch 'upstream/master'
Clear