Headers Fixed
Merged changes from pheonixcoder - header fixes