First cut of de rebus bellicis
merge fixed