changes
Merge branch 'master' of https://github.com/egiw/x-slim