Fixed #2 - Add support for old style excerpt