merge commander into master