Merge branch 'master' of https://github.com/topahl/SUM.git