Closes #140 - Fix commander detection.