Fix #47

Here is my solution for issue #47