Feature/12

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