bugfixes
Merge branch 'master' of github.com:k1slim/k1slim.github.com