Client improvements
Version 0.2.0