Improved code/Javadoc and adapted to new version of kws-content-api

Change-Id: I56967a406a468d8da2ea96431df25bde7d995cb6