Added the --main switch to define a main method, added some new tokens, updated the readme