Use rest-friend branch for issue #1