Merging from upstream.
Merge branch 'master' of github.com:barbagallo/leapjs