Feature/sort dictonary keys

Fixed in cbd8fa6