Changed make fule to use .hpp instead of .h!