updates issue
Merge branch 'master' of git.pyg8.com:csd_sidecar

Conflicts:
	csd.rb