Making it python2.7 and python3.4 compatible
Merge branch 'master' into develop