Fixed #20: Added authorship to the file and improvements on the design.