addresses #140, #143

See #140, #143