Updated for Edison BB support with new flag, update from new version of nweb master.