0.6.0: Added whitespace option