merging jonathans new branch with master