using map/filter in mapper
removing redundant try/catch block
Merge pull request #2 from kneufeld/kurt

Kurt