Fixed some stuff
Merge pull request #27 from Volter9/pull

Fixed some stuff