Issue50

Fixes #50