Manually merge pull #68 from timyates