Fix for Bug #13
Merge pull request #55 from RemyLebeau/patch-5

Fix for Bug #13