Updated to v1.5 code.
Merge pull request #21 from Jonnycake/v1.5

Updated to v1.5 code.