Add ability to include waiting strings. See #1