Merge branch 'develop'
python 3.3 to travis
now is working with python3
Merge branch 'master' into develop