merge changes from villageinteractive branch