merge pull #88