Merge pull request #2 from dimkof/master

update