Major performance improvements
Syntax update to pass lint
Release v0.0.30
Resolve merge conflict
Release v0.0.31