Resolve problema de *source e *pauthor

Fixes #607
Fixes #608