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

I am testing now this version in my project - all your tests are passed
I will let to know about result