Merge
Merge branch 'master' of github.com:itu-cstp/sigb2013
Fixes