Fixes
Merge branch 'master' of github.com:v6sa/socle