Merge pull request #2 from avbdr/master

Merge from avbdr