Finish 1.1.0 functionality

- [x] #45 
- [x] #42 
- [x] #35