Feature/fix issue 13