Merge pull request #1 from addenial/master

Update