Add prefix support, closes #25