edits and [hopefully] tags updated
Merge pull request #367 from thehackerati/ketigian-branch

edits and [hopefully] tags updated