made nicer and worked on types
Merge branch 'master' of github.com:JacobEdelman/lark