Make messages nicer to use, fixes #9