Merged https://github.com/igniterealtime/Spark/pull/237
Merged https://github.com/igniterealtime/Spark/pull/244
Merged https://github.com/igniterealtime/Spark/pull/245