Merge pull request #1 from juven/master

update 1.1.5 code