Merge branch 'different'

Conflicts:
	README.md

Signed-off-by: Patrik Toma <patotoma@gmail.com>