Added prefix
and suffix
custom option
#571
Merged
prefix
and suffix
custom option
#571