Fixed #1 Added custom prefix and suffix