some refactoring more
Merge branch 'master' of github.com:luca-penasa/spc