Issue/#295

Fixes #295 & fixes #311