- Fixed #29
- Fixed #28
- Fixed #20