Add baseTag support
Merge pull request #14 from egeste/base-tag

Add baseTag support fuggin awesome