more and more if/else
Merge pull request #10 from delasky/master

Merge pull request #9 from delasky/working
idk
Merge pull request #11 from delasky/working

Working