Add suggestions from @wasade

Thanks!  Fixes #260