simplified install instructions
merging local changes