Merge pull request #305 from szabadka/master Reorder members of the Command struct plus fix some warnings.