Fixed issue #6: Mixed tabs and spaces & trailing whitespace.