Added Example and make some fixes.