Merge pull #133