Updated for 1.5
Merge pull request #2 from alex-humphreys/patch-1

Updated for 1.5