Fixed #378 and #382
Fixed #378 and #382

share/ShareJS,luto/ShareJS,matthewbauer/ShareJS,modulexcite/ShareJS,rasata/ShareJS,erpframework/ShareJS,a0x/ShareJS,freewind/ShareJS,mcanthony/ShareJS,Nzaga/ShareJS,kustomzone/ShareJS