Added *args and **kargs to heartbeat handler
Fixed args
fixed merge confilcts
Merge pull request #15 from jivid/sakshi/develop

Added *args and **kwargs to heartbeat handler