Merge branch 'master' of https://github.com/kreker92/spo
some changes
Merge branch 'master' of https://github.com/kreker92/spo