Restore subject prefix
Merge pull request #202 from just3ws/master

Restore subject prefix