enhances alignments
Merge branch 'master' into post-comments