Fix for 156 needs testing

Fixes 157 needs testing
Merge branch 'testing' of github.com:lots0logs/Cnchi into testing