Fixed #1, added codehsip integration