commit 13
Merge branch 'master' into good_branch

Conflicts:
	README.md

Signed-off-by: Sergey Rozhkov <progger007@gmail.com>