Fixes #258 Fixes #259

Stable Version 1.5.1.