Merge pull request #9 from csirtgadgets/develop

Develop
cleaning up cols...