updates
Merge branch 'dev' of github.com:obullo/o2 into dev