edits by roma
Merge branch 'master' of github.com:f1lab/xxi