bugfixes for sorting, adding \***{***}
Merge pull request #16 from Wikunia/master

bugfixes for sorting, adding \***{***}