Merge pull # 2