Feature/fix issue 108