Added option for sorting & v0.1.1