Merge pull request #2 from csirtgadgets/develop

Develop
Merge branch 'develop'
fixes https://github.com/csirtgadgets/massive-octo-spice/issues/107