Merge pull request #138 from abouffard/master

Added support for custom tags