Merge branch 'master' of github.com:nscoding/NSKit