Custom tags

Change to implement #57.