Merge branch 'master' of github.com:xseignard/leapLamp
Merge branch 'master' of github.com:xseignard/leapLamp