Suggested changes

@danbev Please check your e-mail