Improves #90. Added token