#277 Done

Ready for Test, and for up to devel.