version before merging andreas' work
first merge with andreas