Fix: Issue #2 and move client version to 2.2.7