Fixed a couple of bugs
Fixed a couple of bugs

fouzelddin/ninja,watsonmw/ninja,jenalgit/ninja,bihe/ninja,skyseazcq/ninja-1,ninjaframework/ninja,liudianpeng/ninja,duqiao/ninja,mallowlabs/ninja,momiji/ninja,fouzelddin/ninja,jlannoy/ninja,bihe/ninja,bazi/ninja,kidaa/ninja,jenalgit/ninja,SpiralsSeminaire/ninja,jlannoy/ninja,khmarbaise/ninja,fizzed/ninja,skyseazcq/ninja-1,raphaelbauer/ninja,khmarbaise/ninja,ninjaframework/ninja,ninjaframework/ninja,jlannoy/ninja,cesarmarinhorj/ninja,zubaidullo/ninja,bazi/ninja,StetsiukRoman/ninja,cesarmarinhorj/ninja,tempbottle/ninja-1,kidaa/ninja,fizzed/ninja,zubaidullo/ninja,SpiralsSeminaire/ninja,fizzed/ninja,mallowlabs/ninja,mallowlabs/ninja,tempbottle/ninja-1,StetsiukRoman/ninja,ninjaframework/ninja,bazi/ninja,watsonmw/ninja,fizzed/ninja,jlannoy/ninja,raphaelbauer/ninja,watsonmw/ninja,duqiao/ninja,liudianpeng/ninja,bihe/ninja,raphaelbauer/ninja,raphaelbauer/ninja,momiji/ninja