Updated for 1.5
Merge pull request #39 from alex-humphreys/master

Updated for 1.5