Merge branch 'fix-issue-233'
Merge pull request #239 from DemocracyOS/master

Merge branch 'fix-issue-233'