Correcting improper use of map function.
Merge branch 'development'