Fixed #22. Fixed #23. Fixed #24.