successful Faye implementation.
Merge branch 'master' into faye-implementation