More minor changes
Merge branch 'myWork'