Fix bugs
resovled conflicts
conflicts
Fix
Merge branch 'master', remote-tracking branch 'upstream/master'
Fix
Merge pull request #252 from leoowen19/master

Fix bugs with Redundant lambda parameter