updates #22

Closed
qvqc wants to merge 6 commits from <deleted>:master into master