work on control in progress
Merge branch 'master' of https://github.com/anlif/sanntid