Updates
Merge branch 'master' of https://github.com/lukas417/SJ