djzin Merge pull request #1 from scottmcm/master …