phi-gamma Merge pull request #407 from phi-gamma/master