Merging work done in peter thiemann's repository to manuel's repo