Added dev feature.
Merge upstream, fix README conflict.
Merge pull request #1 from MSOpenTech/dev

Added Dev feature