Merge pull request #15 from andygup/master

Finished update. This is v1.5