Removing extra return
Merge branch '2.0.0' into issue-485