Merge pull request #692 from Arantor/release-2.1

! Oops, that shouldn't have been Wedge style code.