Issue 152

Fix for https://github.com/energia/Energia/issues/174