improved control
Merge branch 'master' of https://github.com/nthatte/ACRLHW5