fixed "lightning crash"
Merge branch 'master' of https://github.com/kestein/Kanakatana