Fixed #25. Fixed #26.