moyogo Merge pull request #22 from daltonmaag/ufo3