Merge branch 'master' of https://github.com/IAIK/sweb
Merge branch 'master' of https://github.com/MarkusTeufelberger/sweb