Fixed #8. Fixed #9.