Merge of appveyor and initial change to net-ping2