Issue #13 - Other changes...