add options to page
update make file
merged conflict in readme file