added "citable" concern
added tests for trim_attributes
Merge remote-tracking branch 'origin/master'