Modified project to be Python2/3 compatible