fix/custom-token-stuff #83

Closed Ivshti closed 6 years ago