Updated version
Added base tag support