cg/toggle-align function added
Merge remote-tracking branch 'origin/master'