Fixed changes for Devoxx 2014