#278 Added 'local' option to beacon
#246 Merge branch 'origin/develop'