Implemented #120. Close #120.