Pizzalol Merge pull request #108 from dustingraham/patch-1 …