merged code from latest snapshot
added nuspec, props and targets