Merge pull request #7 from UmkaDK/issue-6

Fixed taggatron_enabled issue
Merge remote-tracking branch 'upstream/master'