A few fixes
Merge branch 'master' of https://github.com/dvaleriani/lerk