change to make token optional
Release 0.3.0