Merge pull request #1 from jambola2/master

Update