Update based on suggestions by @tucotuco

See issue #2