Merge pull request #11 from Tallepyon/master

IF and WHILE done too
Woot

Finishing touches
Some fixes...