Parsing Armory, fixes #6