Dev2.3.0.0

Fixes #275, #276, #277