Merge pull request #62 from seanchen1991/master

(feat) Added handling for lambdas