Fixed assert() macro, fixed header