Merge pull request #266 from shenrie/master

Refactored governance module for easier use