- Fixed #37
- Fixed #35