Minor typographical fixes
Converted from spaces to tabs
Merge branch 'enhancements'