Merge pull request #1 from iamluc/master

update