Some refactoring, and implemented heartbeating
Version bump