Feature adding prefix

See discussion #77