Merge pull request #9 from nZEDb/dev

Dev
Merge pull request #10 from nZEDb/dev

Dev
some minor changes for nfo files
Merge pull request #498 from ugokanain/dev

Dev