Fixing tags check for undefined.
Merge pull request #591 from johnkchiu/develop_2.0

Fixing tags check for undefined.
Merge pull request #613 from wordnik/develop_2.0

Sync `develop_2.0` branch back to `master`