Updated to version 1.5 code.
Merge pull request #18 from Jonnycake/v1.5

Updated to version 1.5 code.