Merge branch 'develop'
Release v1.2.0

This includes a helper function to parse tokens.
Merge branch 'master' into develop