Merge pull request #476 from kanoi/master avalon for timeout allow d='calculate it' and fix uninitialised