v1.7

Final commit! After some fixes from teacher! :)