Views Branch Corrected and Merged with Master Branch