Merge pull request #1 from asm-products/master

merge