race condition
Merge branch 'novanetworkblock' into ordering
Merge pull request #136 from cjoelrun/ordering

Ordering
fix nova
Merge pull request #137 from cjoelrun/master

fix nova