Merge branch 'master' of https://github.com/Orkish/heartbeatink into development
Merge branch 'development' of https://github.com/Orkish/heartbeatink into development
Merge branch 'development' of https://github.com/Orkish/heartbeatink into development
cleaned up some codes