refactor
Merge branch 'master' of github.com:bonzofenix/client

Conflicts:
	lib/client.rb