changes in units of time related parameters
Merge branch 'master' of https://github.com/nikhatkarimi/nw