commit

added comment
commit

zTXt changes
Merge branch 'master' into chstr_branch