Merge branch 'no2' of https://github.com/uian/Spoon-Knife into no2

Conflicts:
README copy
noconflick