merged all changes from icwsm paper