preprocessor optimization, unnecessary map creation removed
it used to be O(n^2), now it's only O(n)
Updated authors (vflashm)
spelling fix: desctructor => destructor
Fixed wrong unittest introduced in b36a887608854c2644ef78cf2e98b7087fc12f75
Merge remote-tracking branch 'upstream/master'