Added bookmark feature
conflicts successfully merged