Merge pull request #44 from domob1812/locked-fee

Make locked fee for generals more flexible.