Merge branch 'master' of github.com:mfrasca/xskat