Whitespace cleanup.
Updated map() to include filter options.
Merge remote-tracking branch 'origin/master'