Updated readme file and wiki