Merge branch 'control' of https://github.com/jlaura/autocnet into control