6.0.0

Fixes #339
@samccone please review