0.3.7.1

- Design improvements
- Fix some bugs