Merge pull request #1 from dimkof/master

update