Merge pull request #8 from cantierecreativo/2-0-stable

Minor updates
Sort only by position in index