updates
Merge branch 'master' of github.com:klaascuvelier/obi-js