fixed for test system
Merge branch 'master' of github.com:IAIK/sweb