merging improvements from testwiki (thanks «Technical13)