#184 Review PR

This PR is created for initial reviewing of the changes of #184 because #184 includes many external changes and hard to review.
For backwards compatibility. http://msdn.microsoft.com/en-us/library/1zebz5fw.aspx