Merge pull request #2 from bheesham/master

Merged in @cdelahousse's pull request without the conflicts.