Issues/38

Resolves issue #38