Further improvements
Merge branch 'master' of github.com:KDercksen/SPML