Merge branch 'master' of ssh://github.com/gnardin/emilia