Fixed #17. Fixed #21.