[feature018] bugfix from Medic
[feature019] add js by Medic