#402 review of beacon flow and performance
#402 linting
#402 Fixed minor issue with incorrect return value on callback
Merge pull request #403 from joola/feature/#402

#402 review of beacon flow and performance