added support for source identifier, fixes #7