Ready/159

Fixes #159