Minor changes. Fixed #20.