03 dec merge
Merge pull request #102 from cuss/master

Master
kolton.nip - typo
Merge remote-tracking branch 'upstream/master'