merge si tagarea, partial
modificari minore #11
merge tagarea #11