icraggs Merge pull request #124 from tjdai/master