merge pull 78