Many changes #39

Credits @Cpasmoi