Merge pull request #231 from pabuhler/ver-2.1.0-pre

Advance version on master