Views

merging into master the changes from views