Fixed #12, and some other bugs.