Merged Abhi's code. Finished implementation.
Merge pull request #1 from drem-darios/Merge-Beaconometer

Merged Abhi's code. Finished implementation.