Fixed #8. Fixed #12.