correct bug
Merge branch 'master' of github.com:adrewyew/jikiwi