Feature/fix issue 14