Fixed 9.
Fixed #9 properly.
Merge pull request #14 from henrygouk/master

Fixed #9