Merge pull request #73 from polarkac/custom_prefix