merge
Merge branch 'master' of https://github.com/petergrabowski/networks
Merge branch 'master' of https://github.com/petergrabowski/networks
merge mess
fix time, strange enum