Stashing my changes before pulling the master
Merge pull request #21 from sjyk/sortmerge

Stashing my changes before pulling the master