Added tags instead of start and end chars. Fixes #4 and partly #2.