Merge pull request #59 from Artemy-Mellanox/master

DEVX