Fixed some bugs based on comments from the pull request
Fixed some bugs based on comments from the pull request

newswim/meteor,nuvipannu/meteor,nuvipannu/meteor,newswim/meteor,chasertech/meteor,devgrok/meteor,chasertech/meteor,nuvipannu/meteor,jdivy/meteor,DAB0mB/meteor,AnthonyAstige/meteor,jdivy/meteor,lassombra/meteor,Urigo/meteor,benstoltz/meteor,nuvipannu/meteor,lpinto93/meteor,meonkeys/meteor,mjmasn/meteor,DAB0mB/meteor,meonkeys/meteor,DAB0mB/meteor,mjmasn/meteor,chasertech/meteor,nuvipannu/meteor,lassombra/meteor,AnthonyAstige/meteor,newswim/meteor,meonkeys/meteor,AnthonyAstige/meteor,devgrok/meteor,newswim/meteor,lassombra/meteor,benstoltz/meteor,lpinto93/meteor,benstoltz/meteor,Urigo/meteor,devgrok/meteor,chasertech/meteor,Urigo/meteor,newswim/meteor,devgrok/meteor,jdivy/meteor,lassombra/meteor,Urigo/meteor,nuvipannu/meteor,nuvipannu/meteor,devgrok/meteor,lorensr/meteor,benstoltz/meteor,AnthonyAstige/meteor,newswim/meteor,devgrok/meteor,lpinto93/meteor,AnthonyAstige/meteor,lassombra/meteor,mjmasn/meteor,lpinto93/meteor,4commerce-technologies-AG/meteor,newswim/meteor,chasertech/meteor,lassombra/meteor,mjmasn/meteor,benstoltz/meteor,AnthonyAstige/meteor,lorensr/meteor,jdivy/meteor,4commerce-technologies-AG/meteor,DAB0mB/meteor,benstoltz/meteor,AnthonyAstige/meteor,4commerce-technologies-AG/meteor,lorensr/meteor,lassombra/meteor,lorensr/meteor,4commerce-technologies-AG/meteor,4commerce-technologies-AG/meteor,lorensr/meteor,devgrok/meteor,mjmasn/meteor,meonkeys/meteor,benstoltz/meteor,lorensr/meteor,mjmasn/meteor,meonkeys/meteor,4commerce-technologies-AG/meteor,meonkeys/meteor,lpinto93/meteor,Hansoft/meteor,Urigo/meteor,Hansoft/meteor,AnthonyAstige/meteor,chasertech/meteor,Hansoft/meteor,Hansoft/meteor,meonkeys/meteor,DAB0mB/meteor,4commerce-technologies-AG/meteor,DAB0mB/meteor,lpinto93/meteor,Hansoft/meteor,Urigo/meteor,mjmasn/meteor,jdivy/meteor,DAB0mB/meteor,Hansoft/meteor,jdivy/meteor,chasertech/meteor,lorensr/meteor,Hansoft/meteor,jdivy/meteor,lpinto93/meteor,Urigo/meteor