I do not remember, what I changed
Merge branch 'master' of https://github.com/bitterfly/6a
Merge branch 'master' of https://github.com/bitterfly/6a