Feature/fix issue 53