Added ugly hack to ConnectionListener and cleaned up "doc/" folder