compare dev_1.0 to master branch

This is for educational purposes.