Fixed #10 and updated readme substantially