updates made during last demo
Merge branch 'master' of github.com:BayNode/BayNode