This branch consists all my fixes and new feature (hearbeat)

I am testing now this version in my project
I will let to know about result