Merge pull request #14 from Infinidat/master