Fixed headaer and fixed #11