Merge #16

Merges grazcoin's new changes, in PR #16.