Update per tweaks from @yogoo. Fixes #71