Merge pull request #1 from OpenViX/master