Refactor to support 1.6 JREs
Fix problem with Heart Rate Display