Issue#327

closes #327, closes #362