added wohali's changes and updated readme