Work in progress
Merge branch 'master' of https://github.com/fikovnik/ttc14-fixml-sigma