master
Merge branch 'master' of https://github.com/STIRS/STIRS2012