glenrobertson Merge pull request #38 from kennynaoh/patch-1