Fixed all the stuff in issue #35 and commented out the easter egg (sorry guys)