more changes
Merge branch 'swc' of github.com:polyphemus-ci/polyphemus into swc