cshirky Merge pull request #3 from imakewebthings/patch-1