Merge pull request #1 from mvo5/master

Small comment fixes
Merge pull request #2 from mvo5/master

Missing COPYING file
Merge remote-tracking branch 'zimk/master'