minor changes
merging beta
mergin beta
Merge branch 'sebataz.ch' into beta