diff --git a/README.rst b/README.rst
index 1a82f5c..1fea29c 100644
--- a/README.rst
+++ b/README.rst
@@ -151,6 +151,11 @@ ASDL
               | Import(alias* names)
               | ImportFrom(identifier? module, alias* names, int? level)
 
+              -- Doesn't capture requirement that locals must be
+              -- defined if globals is
+              -- still supports use as a function!
+              | Exec(expr body, expr? globals, expr? locals)
+
               | Global(identifier* names)
               | Nonlocal(identifier* names)
               | Expr(expr value)
@@ -180,8 +185,11 @@ ASDL
              -- x < 4 < 3 and (x < 4) < 3
              | Compare(expr left, cmpop* ops, expr* comparators)
              | Call(expr func, expr* args, keyword* keywords)
+             | Repr(expr value)
              | Num(object n) -- a number as a PyObject.
              | Str(string s) -- need to specify raw, unicode, etc?
+             | FormattedValue(expr value, int? conversion, expr? format_spec)
+             | JoinedStr(expr* values)
              | Bytes(bytes s)
              | NameConstant(singleton value)
              | Ellipsis
diff --git a/gast/gast.py b/gast/gast.py
index f1bf062..fcbd656 100644
--- a/gast/gast.py
+++ b/gast/gast.py
@@ -132,6 +132,9 @@ _nodes = {
             (expr,)),
     'Str': (('s',), ('lineno', 'col_offset',),
             (expr,)),
+    'FormattedValue': (('value', 'conversion', 'format_spec',),
+                       ('lineno', 'col_offset',), (expr,)),
+    'JoinedStr': (('values',), ('lineno', 'col_offset',), (expr,)),
     'Bytes': (('s',), ('lineno', 'col_offset',),
               (expr,)),
     'NameConstant': (('value',), ('lineno', 'col_offset',),
diff --git a/tox.ini b/tox.ini
index 7f0c4e1..4a2a146 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py30,py31,py32,py33,py34,py35
+envlist = py27,py30,py31,py32,py33,py34,py35,py36
 [testenv]
 deps =
     astunparse

Python 3.6 f-strings are not supported by gast
What happens with `gast`:
```sh
$ python3.6 -c "import gast; print(gast.dump(gast.parse('f\'{x}\'')))"
Module(body=[Expr(value=None)])
```

What happens with standard `ast`:
```sh
$ python3.6 -c "import ast; print(ast.dump(ast.parse('f\'{x}\'')))"
Module(body=[Expr(value=JoinedStr(values=[FormattedValue(value=Name(id='x', ctx=Load()), conversion=-1, format_spec=None)]))])
```


diff --git a/tests/test_compat.py b/tests/test_compat.py
index 9faed17..fdf0b0d 100644
--- a/tests/test_compat.py
+++ b/tests/test_compat.py
@@ -62,6 +62,18 @@ class CompatTestCase(unittest.TestCase):
             tree = gast.parse(code)
             compile(gast.gast_to_ast(tree), '<test>', 'exec')
 
+        if sys.version_info.minor >= 6:
+
+            def test_FormattedValue(self):
+                code = 'e = 1; f"{e}"'
+                tree = gast.parse(code)
+                compile(gast.gast_to_ast(tree), '<test>', 'exec')
+
+            def test_JoinedStr(self):
+                code = 'e = 1; f"e = {e}"'
+                tree = gast.parse(code)
+                compile(gast.gast_to_ast(tree), '<test>', 'exec')
+
 
 if __name__ == '__main__':
     unittest.main()

pip install -e .[dev]
parse_log_pytest
pytest
pytest pytest-pep8
3.6
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
attrs @ file:///opt/conda/conda-bld/attrs_1642510447205/work
certifi==2021.5.30
execnet==1.9.0
-e git+https://github.com/serge-sans-paille/gast.git@a43dae94ba014a82cf9303cf827ba1f17bc036a8#egg=gast
importlib-metadata @ file:///tmp/build/80754af9/importlib-metadata_1631916693255/work
iniconfig @ file:///home/linux1/recipes/ci/iniconfig_1610983019677/work
more-itertools @ file:///tmp/build/80754af9/more-itertools_1637733554872/work
packaging @ file:///tmp/build/80754af9/packaging_1637314298585/work
pep8==1.7.1
pluggy @ file:///tmp/build/80754af9/pluggy_1615976315926/work
py @ file:///opt/conda/conda-bld/py_1644396412707/work
pyparsing @ file:///tmp/build/80754af9/pyparsing_1635766073266/work
pytest==6.2.4
pytest-cache==1.0
pytest-pep8==1.0.6
toml @ file:///tmp/build/80754af9/toml_1616166611790/work
typing_extensions @ file:///opt/conda/conda-bld/typing_extensions_1647553014482/work
zipp @ file:///tmp/build/80754af9/zipp_1633618647012/work

name: gast
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - attrs=21.4.0=pyhd3eb1b0_0
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - importlib-metadata=4.8.1=py36h06a4308_0
  - importlib_metadata=4.8.1=hd3eb1b0_0
  - iniconfig=1.1.1=pyhd3eb1b0_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - more-itertools=8.12.0=pyhd3eb1b0_0
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - packaging=21.3=pyhd3eb1b0_0
  - pip=21.2.2=py36h06a4308_0
  - pluggy=0.13.1=py36h06a4308_0
  - py=1.11.0=pyhd3eb1b0_0
  - pyparsing=3.0.4=pyhd3eb1b0_0
  - pytest=6.2.4=py36h06a4308_2
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - toml=0.10.2=pyhd3eb1b0_0
  - typing_extensions=4.1.1=pyh06a4308_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zipp=3.6.0=pyhd3eb1b0_0
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - execnet==1.9.0
      - pep8==1.7.1
      - pytest-cache==1.0
      - pytest-pep8==1.0.6
prefix: /opt/conda/envs/gast

tests/test_compat.py::CompatTestCase::test_FormattedValue tests/test_compat.py::CompatTestCase::test_JoinedStr
tests/test_compat.py::CompatTestCase::test_ArgAnnotation tests/test_compat.py::CompatTestCase::test_Call tests/test_compat.py::CompatTestCase::test_KeywordOnlyArgument tests/test_compat.py::CompatTestCase::test_TryExceptNamed
README.rst tox.ini gast/gast.py
README.rst tox.ini gast/gast.py