removed white spaces
Merge branch 'testing'