Local patch-1 to origin/master
Merge branch 'master' of https://github.com/slobodan/Spoon-Knife into patch-1

Conflicts:
	README