Merged into single .h file; Improved README