Merge pull request #191 from mikewalch/uno-update

Several updates to Uno