More JIN-91 + update to angular 1.2.4