#28 finally fixed the conflict deprecated jquery version + code tweaks