Dexter's commit
Merge pull request #7 from birge/master

Add this