diff --git a/modules/default/weather/forecast.njk b/modules/default/weather/forecast.njk
index c78e89ed..18c2b44f 100644
--- a/modules/default/weather/forecast.njk
+++ b/modules/default/weather/forecast.njk
@@ -14,15 +14,21 @@
                 {% endif %}
                 <td class="bright weather-icon"><span class="wi weathericon wi-{{ f.weatherType }}"></span></td>
                 <td class="align-right bright max-temp">
-                    {{ f.maxTemperature | roundValue | unit("temperature") | decimalSymbol }}
+                    {{ f.maxTemperature | roundValue | unit("temperature") }}
                 </td>
                 <td class="align-right min-temp">
-                    {{ f.minTemperature | roundValue | unit("temperature") | decimalSymbol }}
+                    {{ f.minTemperature | roundValue | unit("temperature") }}
                 </td>
                 {% if config.showPrecipitationAmount %}
-                    <td class="align-right bright precipitation">
-                        {{ f.precipitation | unit("precip") }}
-                    </td>
+                    {% if f.precipitationUnits %}	
+                        <td class="align-right bright precipitation">
+                            {{ f.precipitation }}{{ f.precipitationUnits }}
+                        </td>			
+		    {% else %}
+                        <td class="align-right bright precipitation">
+                            {{ f.precipitation | unit("precip") }}
+                        </td>
+                    {% endif %}
                 {% endif %}
             </tr>
             {% set currentStep = currentStep + 1 %}
diff --git a/modules/default/weather/hourly.njk b/modules/default/weather/hourly.njk
index 3950ece2..76ab94a6 100644
--- a/modules/default/weather/hourly.njk
+++ b/modules/default/weather/hourly.njk
@@ -11,6 +11,10 @@
                     {{ hour.temperature | roundValue | unit("temperature") }}
                 </td>
                 {% if config.showPrecipitationAmount %}
+                    <td class="align-right bright precipitation">
+                        {{ hour.precipitation }}{{ hour.precipitationUnits }}
+                    </td>			
+		    {% else %}
                     <td class="align-right bright precipitation">
                         {{ hour.precipitation | unit("precip") }}
                     </td>
diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js
index 3fbbb42a..5bd5be9a 100755
--- a/modules/default/weather/weatherobject.js
+++ b/modules/default/weather/weatherobject.js
@@ -28,6 +28,7 @@ class WeatherObject {
 		this.rain = null;
 		this.snow = null;
 		this.precipitation = null;
+		this.precipitationUnits = null;
 		this.feelsLikeTemp = null;
 	}