latest changes from meysholdt:master