Feature/11

https://github.com/Kunstmaan/kStrano/issues/11