Bug/107

See issue #107.