Fix for issue #27 ..
No specific new tests added for now
Merge pull request #28 from pombredanne/issue_27

Fix for issue #27 ..