Add Python2 support (now works on both versions)