brought this branch back in line with master after change of tack
(#486)