fixed location of new tag fields
cleanup formatting and add example
fix word counting bug
Merge branch 'master' into RELEASE_20140325