Updated to version 1.5
Merge pull request #4 from nicklockwood/master

Updated to version 1.5