Merge pull request #2 from vitmalina/master

update from original