merge pull requst #3