Adding calibre and unrar
Merging changes