merge PR #43 (qqshfox) - create token only if it does not exist