Add support for starts... ends... Fixes #10