Proposed fix for issue #25
Merge pull request #73 from webbuilders-group/master

Proposed fix for issue #25