Fix8
Merge branch 'master' of https://github.com/edoardo90/scouthis