bug fixed
Merge github.com:craftIk/craftIk