Updated setup script to include six dependency
Merge branch 'master' into development