Merged joseph's changes and updated readme