Fix #34.
Close #33.