Merge branch 'master' into master2
changed comment
Merge pull request #3 from anferneeg/master2

Master2