Fix for #13
Merge pull request #15 from pombredanne/patch-2

Fix for #13