Add token input
Merge pull request #28 from fbrusatti/ed/add_tokeninput

Add token input