Added tags. Fixes #55