Fixed Changes.
Merge branch 'Daniel'