#155 Beacon and Query merge into develop

Resolves #155.
- Added beacon 
- Added query