diff --git a/src/Grammar/dist/Grammar.js b/src/Grammar/dist/Grammar.js
index 4212feba8..3cc0d5b95 100644
--- a/src/Grammar/dist/Grammar.js
+++ b/src/Grammar/dist/Grammar.js
@@ -7980,8 +7980,9 @@ JsSIP.Grammar = (function(){
         }
         if (result0 !== null) {
           result0 = (function(offset) {
-                                var idx;
-                                for (idx in data.multi_header) {
+                                var idx, length;
+                                length = data.multi_header.length;
+                                for (idx = 0; idx < length; idx++) {
                                   if (data.multi_header[idx].parsed === null) {
                                     data = null;
                                     break;
@@ -10237,8 +10238,9 @@ JsSIP.Grammar = (function(){
         }
         if (result0 !== null) {
           result0 = (function(offset) {
-                          var idx;
-                          for (idx in data.multi_header) {
+                          var idx, length;
+                          length = data.multi_header.length;
+                          for (idx = 0; idx < length; idx++) {
                             if (data.multi_header[idx].parsed === null) {
                               data = null;
                               break;
diff --git a/src/Grammar/dist/Grammar.min.js b/src/Grammar/dist/Grammar.min.js
index 53f512e23..422e80866 100644
--- a/src/Grammar/dist/Grammar.min.js
+++ b/src/Grammar/dist/Grammar.min.js
@@ -135,22 +135,22 @@ UTF8_NONASCII:M,UTF8_CONT:T,LHEX:function(){var a;a=s();null===a&&(/^[a-f]/.test
 ctext:Pa,quoted_string:U,quoted_string_clean:ka,qdtext:V,quoted_pair:K,SIP_URI_noparams:la,SIP_URI:oa,uri_scheme:Qa,userinfo:ma,user:Ab,user_unreserved:Ra,password:Bb,hostport:na,host:W,hostname:Ta,domainlabel:Ua,toplabel:Cb,IPv6reference:pa,IPv6address:Va,h16:r,ls32:D,IPv4address:N,dec_octet:X,port:Sa,uri_parameters:yb,uri_parameter:Wa,transport_param:Db,user_param:Eb,method_param:Fb,ttl_param:Gb,maddr_param:Hb,lr_param:Ib,other_param:Jb,pname:Kb,pvalue:Lb,paramchar:Y,param_unreserved:Mb,headers:zb,
 header:ra,hname:Nb,hvalue:Ob,hnv_unreserved:Z,Request_Response:function(){var a;a=hc();null===a&&(a=Pb());return a},Request_Line:Pb,Request_URI:Qb,absoluteURI:Za,hier_part:Sb,net_path:Ub,abs_path:sa,opaque_part:Tb,uric:$,uric_no_slash:Yb,path_segments:Xb,segment:ta,param:$a,pchar:aa,scheme:Rb,authority:Wb,srvr:Zb,reg_name:ba,query:Vb,SIP_Version:Ya,INVITEm:$b,ACKm:ac,OPTIONSm:bc,BYEm:cc,CANCELm:dc,REGISTERm:ec,SUBSCRIBEm:fc,NOTIFYm:gc,Method:qa,Status_Line:hc,Status_Code:ic,extension_code:kc,Reason_Phrase:jc,
 Allow_Events:function(){var a,c,d,e,f,g;f=b;a=ca();if(null!==a){c=[];g=b;d=w();null!==d?(e=ca(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=ca(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Call_ID:function(){var a,c,d,h,j,l;j=h=b;a=Ja();null!==a?(l=b,64===e.charCodeAt(b)?(c="@",b++):(c=null,0===f&&g('"@"')),null!==c?(d=Ja(),null!==d?c=[c,d]:(c=null,b=l)):(c=null,b=l),c=null!==c?c:"",null!==c?a=[a,
-c]:(a=null,b=j)):(a=null,b=j);null!==a&&(k=e.substring(b,h),a=void 0);null===a&&(b=h);return a},Contact:function(){var a,c,d,e,f,g,m;f=b;a=ub();if(null===a)if(g=b,a=ua(),null!==a){c=[];m=b;d=w();null!==d?(e=ua(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=w(),null!==d?(e=ua(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){for(var q in k.multi_header)if(null===k.multi_header[q].parsed){k=null;break}k=null!==k?k.multi_header:
--1;a=void 0}null===a&&(b=f);return a},contact_param:ua,name_addr:O,display_name:va,contact_params:ab,c_p_q:lc,c_p_expires:mc,delta_seconds:P,qvalue:nc,generic_param:C,gen_value:oc,Content_Disposition:function(){var a,c,d,e,f,g;f=b;a=pc();if(null!==a){c=[];g=b;d=x();null!==d?(e=bb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=x(),null!==d?(e=bb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},disp_type:pc,disp_param:bb,
-handling_param:qc,Content_Encoding:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Content_Length:function(){var a,c,d;d=b;c=s();if(null!==c)for(a=[];null!==c;)a.push(c),c=s();else a=null;null!==a&&(k=parseInt(a.join("")),a=void 0);null===a&&(b=d);return a},Content_Type:function(){var a,
-c;c=b;a=rc();null!==a&&(k=e.substring(b,c),a=void 0);null===a&&(b=c);return a},media_type:rc,m_type:sc,discrete_type:uc,composite_type:vc,extension_token:wa,x_token:wc,m_subtype:tc,m_parameter:cb,m_value:xc,CSeq:function(){var a,c,d,e;e=b;a=yc();null!==a?(c=A(),null!==c?(d=qa(),null!==d?a=[a,c,d]:(a=null,b=e)):(a=null,b=e)):(a=null,b=e);return a},CSeq_value:yc,Expires:function(){var a,c;c=b;a=P();null!==a&&(k=a,a=void 0);null===a&&(b=c);return a},Event:function(){var a,c,d,e,f,g,m;g=f=b;a=ca();if(null!==
-a){c=[];m=b;d=x();null!==d?(e=C(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=x(),null!==d?(e=C(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;null!==a&&(k.event=a[0].join("").toLowerCase(),a=void 0);null===a&&(b=f);return a},event_type:ca,From:function(){var a,c,d,e,f,g,m;g=f=b;a=la();null===a&&(a=O());if(null!==a){c=[];m=b;d=x();null!==d?(e=db(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=
-x(),null!==d?(e=db(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){a=k.tag;try{k=new JsSIP.NameAddrHeader(k.uri,k.display_name,k.params),a&&k.setParam("tag",a)}catch(q){k=-1}a=void 0}null===a&&(b=f);return a},from_param:db,tag_param:eb,Max_Forwards:function(){var a,c,d;d=b;c=s();if(null!==c)for(a=[];null!==c;)a.push(c),c=s();else a=null;null!==a&&(k=parseInt(a.join("")),a=void 0);null===a&&(b=d);return a},Min_Expires:function(){var a,c;c=b;
-a=P();null!==a&&(k=a,a=void 0);null===a&&(b=c);return a},Name_Addr_Header:function(){var a,c,d,e,f,g,m,q,p,r;p=q=b;a=[];for(c=va();null!==c;)a.push(c),c=va();if(null!==a)if(c=La(),null!==c)if(d=oa(),null!==d)if(e=Ka(),null!==e){f=[];r=b;g=x();null!==g?(m=C(),null!==m?g=[g,m]:(g=null,b=r)):(g=null,b=r);for(;null!==g;)f.push(g),r=b,g=x(),null!==g?(m=C(),null!==m?g=[g,m]:(g=null,b=r)):(g=null,b=r);null!==f?a=[a,c,d,e,f]:(a=null,b=p)}else a=null,b=p;else a=null,b=p;else a=null,b=p;else a=null,b=p;if(null!==
-a){try{k=new JsSIP.NameAddrHeader(k.uri,k.display_name,k.params)}catch(s){k=-1}a=void 0}null===a&&(b=q);return a},Proxy_Authenticate:function(){return fb()},challenge:fb,other_challenge:zc,auth_param:da,digest_cln:xa,realm:Ac,realm_value:Hc,domain:Bc,URI:ya,nonce:Cc,nonce_value:Ic,opaque:Dc,stale:Ec,algorithm:Fc,qop_options:Gc,qop_value:za,Proxy_Require:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),
-g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Record_Route:function(){var a,c,d,e,f,g,m;g=f=b;a=Aa();if(null!==a){c=[];m=b;d=w();null!==d?(e=Aa(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=w(),null!==d?(e=Aa(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){for(var q in k.multi_header)if(null===k.multi_header[q].parsed){k=null;break}k=
-null!==k?k.multi_header:-1;a=void 0}null===a&&(b=f);return a},rec_route:Aa,Require:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Route:function(){var a,c,d,e,f,g;f=b;a=Ba();if(null!==a){c=[];g=b;d=w();null!==d?(e=Ba(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==
-d;)c.push(d),g=b,d=w(),null!==d?(e=Ba(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},route_param:Ba,Subscription_State:function(){var a,c,d,e,f,g;f=b;a=Jc();if(null!==a){c=[];g=b;d=x();null!==d?(e=gb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=x(),null!==d?(e=gb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},substate_value:Jc,subexp_params:gb,event_reason_value:Kc,
-Subject:function(){var a;a=tb();return null!==a?a:""},Supported:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return null!==a?a:""},To:function(){var a,c,d,e,f,g,m;g=f=b;a=la();null===a&&(a=O());if(null!==a){c=[];m=b;d=x();null!==d?(e=hb(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=
-m);for(;null!==d;)c.push(d),m=b,d=x(),null!==d?(e=hb(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){a=k.tag;try{k=new JsSIP.NameAddrHeader(k.uri,k.display_name,k.params),a&&k.setParam("tag",a)}catch(q){k=-1}a=void 0}null===a&&(b=f);return a},to_param:hb,Via:function(){var a,c,d,e,f,g;f=b;a=Ca();if(null!==a){c=[];g=b;d=w();null!==d?(e=Ca(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=Ca(),null!==
-e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},via_parm:Ca,via_params:ib,via_ttl:Nc,via_maddr:Oc,via_received:Pc,via_branch:Qc,response_port:Rc,sent_protocol:Lc,protocol_name:Sc,transport:Da,sent_by:Mc,via_host:Tc,via_port:Uc,ttl:Xa,WWW_Authenticate:function(){return fb()},extension_header:function(){var a,c,d,e;e=b;a=t();null!==a?(c=sb(),null!==c?(d=Vc(),null!==d?a=[a,c,d]:(a=null,b=e)):(a=null,b=e)):(a=null,b=e);return a},header_value:Vc,message_body:function(){var a,
-b;a=[];for(b=Ia();null!==b;)a.push(b),b=Ia();return a},stun_URI:function(){var a,c,d,h;h=b;a=Wc();null!==a?(58===e.charCodeAt(b)?(c=":",b++):(c=null,0===f&&g('":"')),null!==c?(d=jb(),null!==d?a=[a,c,d]:(a=null,b=h)):(a=null,b=h)):(a=null,b=h);return a},stun_scheme:Wc,stun_host_port:jb,stun_host:Xc,reg_name:ba,stun_unreserved:kb,sub_delims:lb,turn_URI:function(){var a,c,d,h,j,k,m;k=b;a=Yc();null!==a?(58===e.charCodeAt(b)?(c=":",b++):(c=null,0===f&&g('":"')),null!==c?(d=jb(),null!==d?(m=b,"?transport="===
-e.substr(b,11)?(h="?transport=",b+=11):(h=null,0===f&&g('"?transport="')),null!==h?(j=Da(),null!==j?h=[h,j]:(h=null,b=m)):(h=null,b=m),h=null!==h?h:"",null!==h?a=[a,c,d,h]:(a=null,b=k)):(a=null,b=k)):(a=null,b=k)):(a=null,b=k);return a},turn_scheme:Yc,turn_transport:function(){var a,c,d,h,j;j=h=b;a=Da();if(null!==a){"udp"===e.substr(b,3).toLowerCase()?(c=e.substr(b,3),b+=3):(c=null,0===f&&g('"udp"'));if(null===c&&("tcp"===e.substr(b,3).toLowerCase()?(c=e.substr(b,3),b+=3):(c=null,0===f&&g('"tcp"')),
-null===c)){c=[];for(d=y();null!==d;)c.push(d),d=y()}null!==c?a=[a,c]:(a=null,b=j)}else a=null,b=j;null!==a&&(k.transport=transport,a=void 0);null===a&&(b=h);return a}};if(void 0!==E){if(void 0===Zc[E])throw Error("Invalid rule name: "+pb(E)+".");}else E="CRLF";var b=0,f=0,Q=0,Ha=[],k={};if(null===Zc[E]()||b!==e.length){for(var mb=Math.max(b,Q),bd=mb<e.length?e.charAt(mb):null,nb=1,Ea=1,Fa=!1,ob=0;ob<Math.max(b,Q);ob++){var Ga=e.charAt(ob);"\n"===Ga?(Fa||nb++,Ea=1,Fa=!1):"\r"===Ga||"\u2028"===Ga||
-"\u2029"===Ga?(nb++,Ea=1,Fa=!0):(Ea++,Fa=!1)}qb=nb;ga=Ea;var cd=this.SyntaxError,ea=Ha;ea.sort();for(var $c=null,ad=[],fa=0;fa<ea.length;fa++)ea[fa]!==$c&&(ad.push(ea[fa]),$c=ea[fa]);new cd(ad,bd,mb,qb,ga);return-1}return k},toSource:function(){return this._source},SyntaxError:function(e,E,L,ga,g){this.name="SyntaxError";this.expected=e;this.found=E;switch(e.length){case 0:e="end of input";break;case 1:e=e[0];break;default:e=e.slice(0,e.length-1).join(", ")+" or "+e[e.length-1]}E=E?pb(E):"end of input";
-this.message="Expected "+e+" but "+E+" found.";this.offset=L;this.line=ga;this.column=g}};L.SyntaxError.prototype=Error.prototype;return L}();
+c]:(a=null,b=j)):(a=null,b=j);null!==a&&(k=e.substring(b,h),a=void 0);null===a&&(b=h);return a},Contact:function(){var a,c,d,e,f,g,m;f=b;a=ub();if(null===a)if(g=b,a=ua(),null!==a){c=[];m=b;d=w();null!==d?(e=ua(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=w(),null!==d?(e=ua(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){c=k.multi_header.length;for(a=0;a<c;a++)if(null===k.multi_header[a].parsed){k=null;break}k=
+null!==k?k.multi_header:-1;a=void 0}null===a&&(b=f);return a},contact_param:ua,name_addr:O,display_name:va,contact_params:ab,c_p_q:lc,c_p_expires:mc,delta_seconds:P,qvalue:nc,generic_param:C,gen_value:oc,Content_Disposition:function(){var a,c,d,e,f,g;f=b;a=pc();if(null!==a){c=[];g=b;d=x();null!==d?(e=bb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=x(),null!==d?(e=bb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},
+disp_type:pc,disp_param:bb,handling_param:qc,Content_Encoding:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Content_Length:function(){var a,c,d;d=b;c=s();if(null!==c)for(a=[];null!==c;)a.push(c),c=s();else a=null;null!==a&&(k=parseInt(a.join("")),a=void 0);null===a&&(b=d);
+return a},Content_Type:function(){var a,c;c=b;a=rc();null!==a&&(k=e.substring(b,c),a=void 0);null===a&&(b=c);return a},media_type:rc,m_type:sc,discrete_type:uc,composite_type:vc,extension_token:wa,x_token:wc,m_subtype:tc,m_parameter:cb,m_value:xc,CSeq:function(){var a,c,d,e;e=b;a=yc();null!==a?(c=A(),null!==c?(d=qa(),null!==d?a=[a,c,d]:(a=null,b=e)):(a=null,b=e)):(a=null,b=e);return a},CSeq_value:yc,Expires:function(){var a,c;c=b;a=P();null!==a&&(k=a,a=void 0);null===a&&(b=c);return a},Event:function(){var a,
+c,d,e,f,g,m;g=f=b;a=ca();if(null!==a){c=[];m=b;d=x();null!==d?(e=C(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=x(),null!==d?(e=C(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;null!==a&&(k.event=a[0].join("").toLowerCase(),a=void 0);null===a&&(b=f);return a},event_type:ca,From:function(){var a,c,d,e,f,g,m;g=f=b;a=la();null===a&&(a=O());if(null!==a){c=[];m=b;d=x();null!==d?(e=db(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=
+m);for(;null!==d;)c.push(d),m=b,d=x(),null!==d?(e=db(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){a=k.tag;try{k=new JsSIP.NameAddrHeader(k.uri,k.display_name,k.params),a&&k.setParam("tag",a)}catch(q){k=-1}a=void 0}null===a&&(b=f);return a},from_param:db,tag_param:eb,Max_Forwards:function(){var a,c,d;d=b;c=s();if(null!==c)for(a=[];null!==c;)a.push(c),c=s();else a=null;null!==a&&(k=parseInt(a.join("")),a=void 0);null===a&&(b=d);return a},Min_Expires:function(){var a,
+c;c=b;a=P();null!==a&&(k=a,a=void 0);null===a&&(b=c);return a},Name_Addr_Header:function(){var a,c,d,e,f,g,m,q,p,r;p=q=b;a=[];for(c=va();null!==c;)a.push(c),c=va();if(null!==a)if(c=La(),null!==c)if(d=oa(),null!==d)if(e=Ka(),null!==e){f=[];r=b;g=x();null!==g?(m=C(),null!==m?g=[g,m]:(g=null,b=r)):(g=null,b=r);for(;null!==g;)f.push(g),r=b,g=x(),null!==g?(m=C(),null!==m?g=[g,m]:(g=null,b=r)):(g=null,b=r);null!==f?a=[a,c,d,e,f]:(a=null,b=p)}else a=null,b=p;else a=null,b=p;else a=null,b=p;else a=null,b=
+p;if(null!==a){try{k=new JsSIP.NameAddrHeader(k.uri,k.display_name,k.params)}catch(s){k=-1}a=void 0}null===a&&(b=q);return a},Proxy_Authenticate:function(){return fb()},challenge:fb,other_challenge:zc,auth_param:da,digest_cln:xa,realm:Ac,realm_value:Hc,domain:Bc,URI:ya,nonce:Cc,nonce_value:Ic,opaque:Dc,stale:Ec,algorithm:Fc,qop_options:Gc,qop_value:za,Proxy_Require:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==
+d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Record_Route:function(){var a,c,d,e,f,g,m;g=f=b;a=Aa();if(null!==a){c=[];m=b;d=w();null!==d?(e=Aa(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=w(),null!==d?(e=Aa(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){c=k.multi_header.length;for(a=0;a<c;a++)if(null===k.multi_header[a].parsed){k=
+null;break}k=null!==k?k.multi_header:-1;a=void 0}null===a&&(b=f);return a},rec_route:Aa,Require:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},Route:function(){var a,c,d,e,f,g;f=b;a=Ba();if(null!==a){c=[];g=b;d=w();null!==d?(e=Ba(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=
+g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=Ba(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},route_param:Ba,Subscription_State:function(){var a,c,d,e,f,g;f=b;a=Jc();if(null!==a){c=[];g=b;d=x();null!==d?(e=gb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=x(),null!==d?(e=gb(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},substate_value:Jc,subexp_params:gb,
+event_reason_value:Kc,Subject:function(){var a;a=tb();return null!==a?a:""},Supported:function(){var a,c,d,e,f,g;f=b;a=t();if(null!==a){c=[];g=b;d=w();null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==d?(e=t(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return null!==a?a:""},To:function(){var a,c,d,e,f,g,m;g=f=b;a=la();null===a&&(a=O());if(null!==a){c=[];m=b;d=x();null!==d?(e=hb(),null!==e?d=[d,e]:(d=
+null,b=m)):(d=null,b=m);for(;null!==d;)c.push(d),m=b,d=x(),null!==d?(e=hb(),null!==e?d=[d,e]:(d=null,b=m)):(d=null,b=m);null!==c?a=[a,c]:(a=null,b=g)}else a=null,b=g;if(null!==a){a=k.tag;try{k=new JsSIP.NameAddrHeader(k.uri,k.display_name,k.params),a&&k.setParam("tag",a)}catch(q){k=-1}a=void 0}null===a&&(b=f);return a},to_param:hb,Via:function(){var a,c,d,e,f,g;f=b;a=Ca();if(null!==a){c=[];g=b;d=w();null!==d?(e=Ca(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);for(;null!==d;)c.push(d),g=b,d=w(),null!==
+d?(e=Ca(),null!==e?d=[d,e]:(d=null,b=g)):(d=null,b=g);null!==c?a=[a,c]:(a=null,b=f)}else a=null,b=f;return a},via_parm:Ca,via_params:ib,via_ttl:Nc,via_maddr:Oc,via_received:Pc,via_branch:Qc,response_port:Rc,sent_protocol:Lc,protocol_name:Sc,transport:Da,sent_by:Mc,via_host:Tc,via_port:Uc,ttl:Xa,WWW_Authenticate:function(){return fb()},extension_header:function(){var a,c,d,e;e=b;a=t();null!==a?(c=sb(),null!==c?(d=Vc(),null!==d?a=[a,c,d]:(a=null,b=e)):(a=null,b=e)):(a=null,b=e);return a},header_value:Vc,
+message_body:function(){var a,b;a=[];for(b=Ia();null!==b;)a.push(b),b=Ia();return a},stun_URI:function(){var a,c,d,h;h=b;a=Wc();null!==a?(58===e.charCodeAt(b)?(c=":",b++):(c=null,0===f&&g('":"')),null!==c?(d=jb(),null!==d?a=[a,c,d]:(a=null,b=h)):(a=null,b=h)):(a=null,b=h);return a},stun_scheme:Wc,stun_host_port:jb,stun_host:Xc,reg_name:ba,stun_unreserved:kb,sub_delims:lb,turn_URI:function(){var a,c,d,h,j,k,m;k=b;a=Yc();null!==a?(58===e.charCodeAt(b)?(c=":",b++):(c=null,0===f&&g('":"')),null!==c?(d=
+jb(),null!==d?(m=b,"?transport="===e.substr(b,11)?(h="?transport=",b+=11):(h=null,0===f&&g('"?transport="')),null!==h?(j=Da(),null!==j?h=[h,j]:(h=null,b=m)):(h=null,b=m),h=null!==h?h:"",null!==h?a=[a,c,d,h]:(a=null,b=k)):(a=null,b=k)):(a=null,b=k)):(a=null,b=k);return a},turn_scheme:Yc,turn_transport:function(){var a,c,d,h,j;j=h=b;a=Da();if(null!==a){"udp"===e.substr(b,3).toLowerCase()?(c=e.substr(b,3),b+=3):(c=null,0===f&&g('"udp"'));if(null===c&&("tcp"===e.substr(b,3).toLowerCase()?(c=e.substr(b,
+3),b+=3):(c=null,0===f&&g('"tcp"')),null===c)){c=[];for(d=y();null!==d;)c.push(d),d=y()}null!==c?a=[a,c]:(a=null,b=j)}else a=null,b=j;null!==a&&(k.transport=transport,a=void 0);null===a&&(b=h);return a}};if(void 0!==E){if(void 0===Zc[E])throw Error("Invalid rule name: "+pb(E)+".");}else E="CRLF";var b=0,f=0,Q=0,Ha=[],k={};if(null===Zc[E]()||b!==e.length){for(var mb=Math.max(b,Q),bd=mb<e.length?e.charAt(mb):null,nb=1,Ea=1,Fa=!1,ob=0;ob<Math.max(b,Q);ob++){var Ga=e.charAt(ob);"\n"===Ga?(Fa||nb++,Ea=
+1,Fa=!1):"\r"===Ga||"\u2028"===Ga||"\u2029"===Ga?(nb++,Ea=1,Fa=!0):(Ea++,Fa=!1)}qb=nb;ga=Ea;var cd=this.SyntaxError,ea=Ha;ea.sort();for(var $c=null,ad=[],fa=0;fa<ea.length;fa++)ea[fa]!==$c&&(ad.push(ea[fa]),$c=ea[fa]);new cd(ad,bd,mb,qb,ga);return-1}return k},toSource:function(){return this._source},SyntaxError:function(e,E,L,ga,g){this.name="SyntaxError";this.expected=e;this.found=E;switch(e.length){case 0:e="end of input";break;case 1:e=e[0];break;default:e=e.slice(0,e.length-1).join(", ")+" or "+
+e[e.length-1]}E=E?pb(E):"end of input";this.message="Expected "+e+" but "+E+" found.";this.offset=L;this.line=ga;this.column=g}};L.SyntaxError.prototype=Error.prototype;return L}();
diff --git a/src/Grammar/src/Grammar.pegjs b/src/Grammar/src/Grammar.pegjs
index 72b1dce75..438a03070 100644
--- a/src/Grammar/src/Grammar.pegjs
+++ b/src/Grammar/src/Grammar.pegjs
@@ -375,8 +375,9 @@ Call_ID  =  word ( "@" word )? {
 // CONTACT
 
 Contact             = ( STAR / (contact_param (COMMA contact_param)*) ) {
-                        var idx;
-                        for (idx in data.multi_header) {
+                        var idx, length;
+                        length = data.multi_header.length;
+                        for (idx = 0; idx < length; idx++) {
                           if (data.multi_header[idx].parsed === null) {
                             data = null;
                             break;
@@ -621,8 +622,9 @@ option_tag     = token
 // RECORD-ROUTE
 
 Record_Route  = rec_route (COMMA rec_route)* {
-                  var idx;
-                  for (idx in data.multi_header) {
+                  var idx, length;
+                  length = data.multi_header.length;
+                  for (idx = 0; idx < length; idx++) {
                     if (data.multi_header[idx].parsed === null) {
                       data = null;
                       break;
diff --git a/src/Parser.js b/src/Parser.js
index 64fb402cc..6a7863a66 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -46,7 +46,7 @@ function getHeader(data, headerStart) {
 }
 
 function parseHeader(message, data, headerStart, headerEnd) {
-  var header, idx, parsed,
+  var header, idx, length, parsed,
     hcolonIndex = data.indexOf(':', headerStart),
     headerName = data.substring(headerStart, hcolonIndex).trim(),
     headerValue = data.substring(hcolonIndex + 1, headerEnd).trim();
@@ -91,7 +91,8 @@ function parseHeader(message, data, headerStart, headerEnd) {
         parsed = undefined;
       }
 
-      for(idx in parsed) {
+      length = parsed.length;
+      for (idx = 0; idx < length; idx++) {
         header = parsed[idx];
         message.addHeader('record-route', headerValue.substring(header.possition, header.offset));
         message.headers['Record-Route'][message.countHeader('record-route')-1].parsed = header.parsed;
@@ -113,7 +114,8 @@ function parseHeader(message, data, headerStart, headerEnd) {
         parsed = undefined;
       }
 
-      for(idx in parsed) {
+      length = parsed.length;
+      for (idx = 0; idx < length; idx++) {
         header = parsed[idx];
         message.addHeader('contact', headerValue.substring(header.possition, header.offset));
         message.headers['Contact'][message.countHeader('contact')-1].parsed = header.parsed;
diff --git a/src/RTCSession.js b/src/RTCSession.js
index 61169f053..52b3dbd43 100644
--- a/src/RTCSession.js
+++ b/src/RTCSession.js
@@ -41,7 +41,7 @@ RTCSession = function(ua) {
   this.ua = ua;
   this.status = C.STATUS_NULL;
   this.dialog = null;
-  this.earlyDialogs = [];
+  this.earlyDialogs = {};
   this.rtcMediaHandler = null;
 
   // Session Timers
diff --git a/src/RTCSession/RTCMediaHandler.js b/src/RTCSession/RTCMediaHandler.js
index 032c8a054..19ec7c78f 100644
--- a/src/RTCSession/RTCMediaHandler.js
+++ b/src/RTCSession/RTCMediaHandler.js
@@ -105,17 +105,20 @@ RTCMediaHandler.prototype = {
   * @param {Function} onSuccess Fired when there are no more ICE candidates
   */
   init: function(constraints) {
-    var idx, server, scheme, url,
+    var idx, length, server, scheme, url,
       self = this,
-      servers = [];
+      servers = [],
+      config = this.session.ua.configuration;
 
-    for (idx in this.session.ua.configuration.stun_servers) {
-      server = this.session.ua.configuration.stun_servers[idx];
+    length = config.stun_servers.length;
+    for (idx = 0; idx < length; idx++) {
+      server = config.stun_servers[idx];
       servers.push({'url': server});
     }
 
-    for (idx in this.session.ua.configuration.turn_servers) {
-      server = this.session.ua.configuration.turn_servers[idx];
+    length = config.turn_servers.length;
+    for (idx = 0; idx < length; idx++) {
+      server = config.turn_servers[idx];
       url = server.server;
       scheme = url.substr(0, url.indexOf(':'));
       servers.push({
diff --git a/src/SIPMessage.js b/src/SIPMessage.js
index 28e28727c..c7819c560 100644
--- a/src/SIPMessage.js
+++ b/src/SIPMessage.js
@@ -103,14 +103,15 @@ OutgoingRequest.prototype = {
 
     msg += this.method + ' ' + this.ruri + ' SIP/2.0\r\n';
 
-    for(header in this.headers) {
-      for(idx in this.headers[header]) {
+    for (header in this.headers) {
+      length = this.headers[header].length;
+      for (idx = 0; idx < length; idx++) {
         msg += header + ': ' + this.headers[header][idx] + '\r\n';
       }
     }
 
     length = this.extraHeaders.length;
-    for(idx=0; idx < length; idx++) {
+    for (idx = 0; idx < length; idx++) {
       msg += this.extraHeaders[idx] +'\r\n';
     }
 
@@ -208,7 +209,7 @@ IncomingMessage.prototype = {
    * @returns {Array} Array with all the headers of the specified name.
    */
   getHeaderAll: function(name) {
-    var idx,
+    var idx, length,
       header = this.headers[JsSIP.Utils.headerize(name)],
       result = [];
 
@@ -216,7 +217,8 @@ IncomingMessage.prototype = {
       return [];
     }
 
-    for(idx in header) {
+    length = header.length;
+    for (idx = 0; idx < length; idx++) {
       result.push(header[idx].raw);
     }
 
@@ -369,7 +371,7 @@ IncomingRequest.prototype.reply = function(code, reason, extraHeaders, body, onS
   response += 'CSeq: ' + this.cseq + ' ' + this.method + '\r\n';
 
   length = extraHeaders.length;
-  for(idx=0; idx < length; idx++) {
+  for (idx = 0; idx < length; idx++) {
     response += extraHeaders[idx] +'\r\n';
   }
 
diff --git a/src/UA.js b/src/UA.js
index 8642b3da6..8b606f256 100644
--- a/src/UA.js
+++ b/src/UA.js
@@ -291,13 +291,14 @@ UA.prototype.getCredentials = function(request) {
  */
 UA.prototype.onTransportClosed = function(transport) {
   // Run _onTransportError_ callback on every client transaction using _transport_
-  var type, idx,
+  var type, idx, length,
     client_transactions = ['nict', 'ict', 'nist', 'ist'];
 
   transport.server.status = JsSIP.Transport.C.STATUS_DISCONNECTED;
   console.log(LOG_PREFIX +'connection state set to '+ JsSIP.Transport.C.STATUS_DISCONNECTED);
 
-  for(type in client_transactions) {
+  length = client_transactions.length;
+  for (type = 0; type < length; type++) {
     for(idx in this.transactions[client_transactions[type]]) {
       this.transactions[client_transactions[type]][idx].onTransportError();
     }
@@ -563,10 +564,11 @@ UA.prototype.findDialog = function(request) {
  */
 UA.prototype.getNextWsServer = function() {
   // Order servers by weight
-  var idx, ws_server,
+  var idx, length, ws_server,
     candidates = [];
 
-  for (idx in this.configuration.ws_servers) {
+  length = this.configuration.ws_servers.length;
+  for (idx = 0; idx < length; idx++) {
     ws_server = this.configuration.ws_servers[idx];
 
     if (ws_server.status === JsSIP.Transport.C.STATUS_ERROR) {
@@ -603,12 +605,13 @@ UA.prototype.closeSessionsOnTransportError = function() {
 };
 
 UA.prototype.recoverTransport = function(ua) {
-  var idx, k, nextRetry, count, server;
+  var idx, length, k, nextRetry, count, server;
 
   ua = ua || this;
   count = ua.transportRecoverAttempts;
 
-  for (idx in ua.configuration.ws_servers) {
+  length = ua.configuration.ws_servers.length;
+  for (idx = 0; idx < length; idx++) {
     ua.configuration.ws_servers[idx].status = 0;
   }
 
@@ -902,7 +905,7 @@ UA.configuration_check = {
     },
 
     ws_servers: function(ws_servers) {
-      var idx, url;
+      var idx, length, url;
 
       /* Allow defining ws_servers parameter as:
        *  String: "host"
@@ -913,7 +916,8 @@ UA.configuration_check = {
       if (typeof ws_servers === 'string') {
         ws_servers = [{ws_uri: ws_servers}];
       } else if (ws_servers instanceof Array) {
-        for(idx in ws_servers) {
+        length = ws_servers.length;
+        for (idx = 0; idx < length; idx++) {
           if (typeof ws_servers[idx] === 'string'){
             ws_servers[idx] = {ws_uri: ws_servers[idx]};
           }
@@ -926,7 +930,8 @@ UA.configuration_check = {
         return false;
       }
 
-      for (idx in ws_servers) {
+      length = ws_servers.length;
+      for (idx = 0; idx < length; idx++) {
         if (!ws_servers[idx].ws_uri) {
           console.error(LOG_PREFIX +'missing "ws_uri" attribute in ws_servers parameter');
           return;
@@ -1057,7 +1062,7 @@ UA.configuration_check = {
     },
 
     stun_servers: function(stun_servers) {
-      var idx, stun_server;
+      var idx, length, stun_server;
 
       if (typeof stun_servers === 'string') {
         stun_servers = [stun_servers];
@@ -1065,7 +1070,8 @@ UA.configuration_check = {
         return;
       }
 
-      for (idx in stun_servers) {
+      length = stun_servers.length;
+      for (idx = 0; idx < length; idx++) {
         stun_server = stun_servers[idx];
         if (!(/^stuns?:/.test(stun_server))) {
           stun_server = 'stun:' + stun_server;
@@ -1087,7 +1093,7 @@ UA.configuration_check = {
     },
 
     turn_servers: function(turn_servers) {
-      var idx, turn_server;
+      var idx, length, turn_server;
 
       if (turn_servers instanceof Array) {
         // Do nothing
@@ -1095,7 +1101,8 @@ UA.configuration_check = {
         turn_servers = [turn_servers];
       }
 
-      for (idx in turn_servers) {
+      length = turn_servers.length;
+      for (idx = 0; idx < length; idx++) {
         turn_server = turn_servers[idx];
         if (!turn_server.server || !turn_server.username || !turn_server.password) {
           return;
diff --git a/src/Utils.js b/src/Utils.js
index e373c088c..0b74f9c00 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -149,10 +149,11 @@ Utils= {
       'Www-Authenticate': 'WWW-Authenticate'
       },
       name = string.toLowerCase().replace(/_/g,'-').split('-'),
-      hname = '', part;
+      hname = '',
+      parts = name.length, part;
 
-    for (part in name) {
-      if (part !== '0') {
+    for (part = 0; part < parts; part++) {
+      if (part !== 0) {
         hname +='-';
       }
       hname += name[part].charAt(0).toUpperCase()+name[part].substring(1);