fix
Merge branch 'kk' of https://github.com/CarbonDevXperia/hudson into kk