Feature/fix issue 56