Closes #24
Closes #25
Closes #25
Updated Undertow version to 1.1.0.CR2