#41
Also removed add2home lib