modified SP behaviour
Merge branch 'master' of github.com:Founky/tagada