Closure improvement + tests
Merge pull request #5 from yaapis/master

Closure improvement + tests