Update to Master. Support Py2.7 better than before.