add: better behave from finish button
Merge branch 'develop' of github.com:capensis/canopsis into develop