Fixed #7. Fixed #10. Fixed #11.