Fixed related things that broke because I didn't save
Merge pull request #52 from EnacheB/master

Fixed related things that broke because I didn't save