Removed unnecessary `Ord' constraint on map- functions
Merge branch 'vklj-master'