Pre 0.3.5

- [x] close #46 
- [x] close #48 
- [x] close #49