saferep. fixes #230
Merge branch 'topic/saferep'