Commit 2.1

Minor changes to commit 2.0