Merge remote-tracking branch 'Mpdreamz/master'
Merge https://github.com/Mpdreamz/NEST
Merge remote-tracking branch 'origin/master'