fixes #20 (yaml), among others