update to 1.5
Merge pull request #7 from confile/master

update to 1.5