alexreardon Merge pull request #19 from negebauer/patch-1