Temp fix to Client
Merge branch 'master' of https://github.com/accidentalManual/1653