Closing #76 & #85

- Previous two commits fixes these issues
- Fixes #76
- Fixes #85