Merge pull request #30 from demarius/rewrite

make proposal ID generation a parameter.
Merge branch `rewrite` into `master`.
Fix function notation.