Fixed faulty merge.
Closed #13.
Jesamine closed #16 #17 #18