final update before submission
Merge origin/master