Serious bug. Working.
bug fixed. Moving on to next bug
Merge pull request #40 from SonOfLysander/master

Fell asleep. Merging code