Merge pull request #1561 from mahagr/merges

Merge pulls #1514 and #1544, fix language issues