6test branch commit
Merge pull request #2 from conqsys/6test

merging to master from 6test