Updated to include x/x commands as per #37