[WIP] Fixing for devoxx 2014