edited testing branch
merged testing branch with master