add: first version for #110 and #109
Merge branch 'develop' of github.com:capensis/canopsis into develop