yukas Merge pull request #3 from bschaeffer/patch-1