holman Merge pull request #392 from fatData/patch-1