Fixed #12 and #15.