Fix end alignment of blocks that spawn on two lines

This fixes #327
Merge pull request #331 from edzhelyov/end-align-for-block-on-next-line

Fix end alignment of blocks that spawn on two lines