Changed to Billmate AB where appropiate. Resolves #17