- Fixed #1
- Fixed #5