Merge pull request #257 from rcordovano/tags_fix

Added necessary null pointer check to static initializer of Tags class
Merge remote-tracking branch 'upstream/master'