update to 1.4
Merge pull request #6 from confile/master

update to 1.4