Integrated @yishaigalatzer 's change after CodePlex sync

Original Source: #1