Merge pull request #1 from vasile/master

update