Fixed bug #5.
Merge pull request #7 from DiederikvandenB/master

Fixed bug #5.