Implemented sorting
    Closes #5
Merge remote-tracking branch 'origin/master'