screaming/screeching stage ?

So, DD has been in the screaming/screetching stage for a couple weeks now but it's getting rather extreme.  She screetches for joy, screams when happy, upset, really high pitch screams if she's not happy (and not because of something like she hit her head or hit herself with a toy, but for minor unhappy things.... ) I know she's "discovering her voice" and at times it's cute but others it sounds like someone is seriously hurting her or something.  (Even the happy ones.  You can tell they're happy ones because she's smiling and giggling after...)  So, anyway, my point being...those that went through this, how long did it last?  Did it end?  Is there hope it will for me? Or do I just have a drama queen in the making on my hands haha.  She's such a lil stinker.  I know you can't really discipline a infant of her age but when she does it I tell her "Adina, what did Mommy tell you, only make those sounds if youre being seriously hurt or someone is trying to kidnap you" so tonight I was like "Adina, what did Mommy say? No screaming!" and she just looked at me, broke into a HUGE grin and went "HAAA!" oh I think we're going to have our hands full