Second update

Second update from new branch
Merge branch 'add_feature1'