Changed terms. Fixes #55