Fix for #41 - Separate rates numbers from units