Closing branch, development for 2.0 complete
Merge pull request #3 from vpotapev/closed/2.0-prep-work

Closing branch, development for 2.0 complete