fix some new issue
Merge branch 'master' of github.com:zordius/lightncandy