Development

Add pull request #342 in master