Merge pull request #4 from technogeeky/v6

V6
Merge branch 'master' into v6