Implemented #88

Not the most beautiful, but hey... it works right? :D