Improved code style. Using uppercase ID instead of Id.
Remove no longer needed CVS $Id in file header.
Merge branch 'master' into remove_cvs_ids