Work on issue #5
Fix #5