Merge pull request #16 from Infinidat/master