added 3.4 to setup.py
Merge branch 'master' into settings