Minor changes
Correctly Implementing NuGet Restore
Fixing Crash related to AVD detection

Fixes #644
Merge pull request #7 from penguinho/master

Fixing Crash related to AVD detection