More chances to compile in embedded mode
Updated the copyright line
Code cleanup