Minor Fixes
Merge branch 'master' of https://github.com/yuripourre/luvia.git