fixes #903, fixess #1513
fixes #903, fixess #1513

dom96/Nim,JCavallo/Nim,fredericksilva/Nim,MrJohz/Nim,russpowers/Nim,Salafit/Nim,tmm1/Nim,tulayang/Nim,nafsaka/Nim,msmith491/Nim,nafsaka/Nim,nimLuckyBull/Nim,nanoant/Nim,nafsaka/Nim,reactormonk/nim,BlaXpirit/nim,Matt14916/Nim,Dhertz/Nim,fredericksilva/Nim,Matt14916/Nim,judofyr/Nim,xland/Nim,jfhg/Nim,msmith491/Nim,zachaysan/Nim,Salafit/Nim,endragor/Nim,gokr/Nim,BlaXpirit/nim,BlaXpirit/nim,jsanjuas/Nim,MrJohz/Nim,xland/Nim,sferik/Nim,sarvex/Nim-lang,Senketsu/Nim,xland/Nim,Dhertz/Nim,tmm1/Nim,bvssvni/Nim,Senketsu/Nim,msmith491/Nim,kirbyfan64/Nim,kirbyfan64/Nim,tmm1/Nim,BlaXpirit/nim,nanoant/Nim,jsanjuas/Nim,tulayang/Nim,greyanubis/Nim,fredericksilva/Nim,bvssvni/Nim,greyanubis/Nim,xland/Nim,haiodo/Nim,douglas-larocca/Nim,mbaulch/Nim,bvssvni/Nim,gokr/Nim,nafsaka/Nim,jfhg/Nim,Matt14916/Nim,reactormonk/nim,xland/Nim,tmm1/Nim,endragor/Nim,nimLuckyBull/Nim,greyanubis/Nim,douglas-larocca/Nim,reactormonk/nim,nafsaka/Nim,Dhertz/Nim,MrJohz/Nim,SSPkrolik/Nim,tmm1/Nim,nafsaka/Nim,Senketsu/Nim,zachaysan/Nim,zachaysan/Nim,douglas-larocca/Nim,reactormonk/nim,russpowers/Nim,tulayang/Nim,endragor/Nim,zachaysan/Nim,douglas-larocca/Nim,mbaulch/Nim,russpowers/Nim,jfhg/Nim,JCavallo/Nim,nanoant/Nim,russpowers/Nim,russpowers/Nim,haiodo/Nim,greyanubis/Nim,sferik/Nim,haiodo/Nim,msmith491/Nim,JCavallo/Nim,gokr/Nim,nanoant/Nim,tulayang/Nim,BlaXpirit/nim,SSPkrolik/Nim,endragor/Nim,sarvex/Nim-lang,mbaulch/Nim,Dhertz/Nim,fmamud/Nim,judofyr/Nim,Senketsu/Nim,mbaulch/Nim,tulayang/Nim,MrJohz/Nim,JCavallo/Nim,fmamud/Nim,nanoant/Nim,gokr/Nim,jsanjuas/Nim,gokr/Nim,reactormonk/nim,judofyr/Nim,dom96/Nim,nanoant/Nim,SSPkrolik/Nim,BlaXpirit/nim,Senketsu/Nim,sferik/Nim,fredericksilva/Nim,zachaysan/Nim,bvssvni/Nim,SSPkrolik/Nim,fredericksilva/Nim,tmm1/Nim,bvssvni/Nim,nimLuckyBull/Nim,judofyr/Nim,xland/Nim,fmamud/Nim,singularperturbation/Nim,endragor/Nim,sferik/Nim,mbaulch/Nim,kirbyfan64/Nim,Dhertz/Nim,kirbyfan64/Nim,dom96/Nim,SSPkrolik/Nim,jfhg/Nim,douglas-larocca/Nim,judofyr/Nim,fredericksilva/Nim,JCavallo/Nim,endragor/Nim,reactormonk/nim,fmamud/Nim,reactormonk/nim,kirbyfan64/Nim,Salafit/Nim,kirbyfan64/Nim,JCavallo/Nim,kirbyfan64/Nim,nanoant/Nim,sferik/Nim,sferik/Nim,douglas-larocca/Nim,nimLuckyBull/Nim,jfhg/Nim,gokr/Nim,singularperturbation/Nim,singularperturbation/Nim,singularperturbation/Nim,mbaulch/Nim,sarvex/Nim-lang,sferik/Nim,fmamud/Nim,nimLuckyBull/Nim,bvssvni/Nim,greyanubis/Nim,douglas-larocca/Nim,greyanubis/Nim,Senketsu/Nim,singularperturbation/Nim,russpowers/Nim,haiodo/Nim,Salafit/Nim,Matt14916/Nim,jsanjuas/Nim,JCavallo/Nim,sferik/Nim,nimLuckyBull/Nim,fmamud/Nim,judofyr/Nim,sarvex/Nim-lang,dom96/Nim,tmm1/Nim,fredericksilva/Nim,msmith491/Nim,zachaysan/Nim,MrJohz/Nim,sarvex/Nim-lang,jfhg/Nim,bvssvni/Nim,mbaulch/Nim,nafsaka/Nim,douglas-larocca/Nim,dom96/Nim,SSPkrolik/Nim,xland/Nim,Matt14916/Nim,haiodo/Nim,Matt14916/Nim,sarvex/Nim-lang,dom96/Nim,kirbyfan64/Nim,haiodo/Nim,sarvex/Nim-lang,SSPkrolik/Nim,fredericksilva/Nim,Salafit/Nim,SSPkrolik/Nim,tulayang/Nim,msmith491/Nim,fmamud/Nim,Salafit/Nim,judofyr/Nim,zachaysan/Nim,endragor/Nim,BlaXpirit/nim,jsanjuas/Nim,msmith491/Nim,jfhg/Nim,haiodo/Nim,nimLuckyBull/Nim,jsanjuas/Nim,singularperturbation/Nim,gokr/Nim,MrJohz/Nim,Dhertz/Nim,MrJohz/Nim,greyanubis/Nim,Matt14916/Nim,gokr/Nim,Dhertz/Nim,dom96/Nim,russpowers/Nim,reactormonk/nim,singularperturbation/Nim,Senketsu/Nim,jsanjuas/Nim,judofyr/Nim,Salafit/Nim,BlaXpirit/nim