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

Updated for 1.5