merge master
increase granularity of sentence counting
Merge branch 'master' into RELEASE_20140325