Ooops, fixed a catastrophic failure. also general cleaning upping
Merge pull request #3 from AngelofSilence/master

I kinda killed the optimization, sorry about that. this fixes it.