Issue284

Resolves #284