Fix design
Refactoring and fix samples
Merge branch 'master' of https://github.com/m039/beacon-keeper