Resolves #147