merge changes from wiki