Updated classes
Merge branch 'master' of https://github.com/heartbeatservice/HeartbeatServiceSolution.git