#53

Solves issue #53