Issue #23 - Improve language