Merge pull request #2 from cbierman/master

Added containers to temperatures
fixed logic for deciding markup