Vse! (reverse-merged from commit 997cd7176ccb99ddcf3bf05b54c1511a4e980f16)
update

DO not yet merge
without class 2 time
docs
Merge pull request #14 from Johnmalc/master

DO NOT merge