Fix issue described at http://www.weberp.org/forum/showthread.php?tid=463
Merge pull request #126 from timschofield/develop

Fix issue described at http://www.weberp.org/forum/showthread.php?tid=46...